Add

Added new classes for testing and made more automated tests.