added tests, removed unused class