Finished Test script. Fixes