Removed some dead code and hopefully fixed the issue where the total list of tests...