Gemified, added unit tests