Added new conditions to test for.