Removed test classes in favor of unit tests