Issue #6: Forgot about Aided

Otherwise, the test in that file takes forever.