modified super
added tests for all objects