Fix tests. closes #10