upgrade the gems + add more tests