unit tests are updated for issue 270