worked on tests a bit