Clean up older tests to match style of newer tests