Adjust tests
Tidied
More tests