Gemification, adding a few tests