Both modules working!

now tidy up and add a couple of extra tests