ADD FURTER TESTS FOR CLASSES