Updated the test base class and the Advisor model test.  Also, updated the Advisor model.