Fix issue #93; add some test helpers

All are :green_book: 

Please review my patch