fixed tests; fixes #1