Fix tests (issue #11)