ADD: Added some extra test classes