cleanup
some tests