big cleanup, all tests working now