#2 working on tests