clean up build system to use variables and run the test suite