Refactored common_test.go