Change order of classed to help test pass in build