working on tests
merged