Fix #28 - Add tests