Couple of issues and a minor typo fix in tests