Started fixing tests for newer yaml format
Fixed all tests to conform to new yaml
Fixed whitespace
Fixed script to give accurate exit codes