cleanup
tests fixed