unit tests, getWith adjustments, new version