[Version Control] Unit Tests - fixups. ;D