Code clean up for Protocol Service Test Case