Fixed several minor issues with tests created/modified in recent commits.
Added a test to get slightly more coverage.