Adding in some script tests, and fixing issues as I discover them