fix remaining errors in tests

Implemented suggested comments from bborn pull request.