#28 cleanup
#28 fixed tests