tidied up test dependancies
All tests passing :)