Fix #18 - Add some tests