FIX: minor issues in tests