Added new classes and tests for each