more cleaning up and tests