Started work on tests