Update unit tests to catch this

This time to handle correctly updating plan/fly view when plan changes

Update the user model to a single controller instead of multiple