Andrew tests added to test.sh