fix for current a_m_s, fix tests, fork gem