added more tests and test cleanup
updated version