Remove double tests and unneeded tests