Getting more tests to run. Most changes are sytax corrections and removing names of objects to satisfy equals()