Added Fms prefix, included tests.