updated tests, cleanup