cleaning up and tests