Tidying up - tests pass