final touch ups
fix test failure