Added some test classes and an association