Modify var names
Adding test files [ci skip]