Continue working on tests