Further work on version handler service tests