refactor tests; clean up movables and radar