added test & test-classes