First working version
Tidy up test