Addition of shell testing, and some minor fixes