improve pod and test