Refactored tests to use context blocks and expects