Issue #160 - Add tests and fextures