fix(builder): change order to pass tests