Reverted test_common to previous state