Fixed tests broken by fix to issue #18