Add unit tests to highlight issue 130