Improved conditions unit test