Updated to setup spies in before and after