Fixed circular dependency on terminal tests