Final tests and remove print

now squash and try and refactor tests a bit