more syntax/style fixes

also deleted some deprecated/commented tests