Switched tests to use agent