adjusted some tests