Got rid of unneeded tests