Change remove condition check order, update existing tests