CORE-1945: Add tests for new preconditions