add unit tests to drill down to #234