4 Tests fixed; 2 tests added