updated tests
cleanup tests