Fixed order issues with tests