Fix tests for issue 52.