Cleanup the tests

Marco Cattaneorequested to merge
cleanupTheTests into master

Remove a couple more redundant tests, and cleanup the options and names of the others.

Edited by Marco Cattaneo

Merge request reports