Issue #147 - Refactor to split get from put tests