2124: Fix tests, version isn't always there