Cleaned up tests so that they all pass. Re-added the version value service.