Tests now passing
Started work on some more tests