Made test suites cleaner, deleted duplicates.