Fix assertion order and :scissors: extra spaces