Cleanup boolean tests