TEST: improving tests