Total test rewrite, and consolidation of user created classes