Fixing broken test (Test that were designed wrong so at the time of fixing issues, those test needs to be redesigned)