progress on srv test cases