NoTask - updated unit tests to be consistent with unencode-addressable-template branch