add tests addressing #18