Fix for remaining Core module tests and removing some redundant tests.