Tidying up, adding additional tests.