Fill in some test gaps
Add test support for hamcest matcher