layer3 code reviewed && adding test template