TEST: improving unit tests