Fix tests
Tidy up tests
Modify follow