Tidied tests to fit with new approach but some not working right...