Last touches for tests