Improved the rigorous test. Yes I am a TDD hacker as well.