Adding more tests
More work on tests