Merge "Restoring dashboard tests"