Refactoring of test base classes.
More refactoring and testing of test base classes.
Merge pull request #551 from enthought/bugfix/contexts-and-testing

Fix bugs with Contexts and Test base classes