Remove unneeded tests

Address #6 #8 #13 #21