Fix Failing tests due to refactoring to use Fragments