Fixed couple syntax typos in tests and code