adding tests

misc cleanup