Tests are green again
Change order