Tests passing
Rationalised test structure to refelct lib