Fixed some tests, and commented some tests that are not necessary anymore.