Refactored actions&assertions