Updated common and tests