added tests
merged remote