added tests
Removed hardcoded test data