Cleaning up code and moving to test/install.sh