refactored test_common to be synchronous