fixing test cases. Closes #3