Added Given helpers and refactoring test setup and teardown