Fixed null exceptions. Fixed order tests