Test Change and Error Fix