Correct order
Update tests