working on tests
add tests
working on tests