replaced strings with vars
fixed tests