More work on #14. 9 tests now pass.