fixed tests, closes #10