Fixed circular dependency on requirements tests