change to use super agent and firm up tests