updated validation interceptor and test cases