renaming variables

and test submodule setup