Started working on tests