force-added test class files
fxed all tests after improving escape mechanisms