updated tests to support new prefix structure