fix tests for frontend order change
Merge branch 'frontendbackend' into nbuild