updated tests
misc clean up