FIX: First attempt at fixing tests in test_common.py