Make CLI 1.8.7-compatible, fix test, version gems