Use our fork of elastigo in tests as well
Exit after printing the version on -version
Remove duplicated block