Only catch EmptyResultDataAccessException when looking for object version
Refactored Integration Tests