Started working on tests and moved all tests into a separate package