make 2 unit tests actually fire; code cleanup