Tweak some methods and make tests better
Make tests more robust against whitespace
Make tests more robust, fix the yield problem