almost there, a little fix in tests