removed duplicate encoding declaration
tweaked how test versions are handled