Fixes to codesystemversion transforms and junit test changes