Add simple opportunistic test cases
Fix some typos in relatively new code base