Fixed errors that failed the test scripts