started working on tests
updated tests a bit