Fix miscellaneous typos - tests now run!