Switch to `it do/end` syntax and refactor tests