Cleanup test cases

Close #6 #8