Better support for tests including for fragments