Creating tests - in progress

Having a play around
Merged with resolved conflicts