Changed script to include more tests