Fixes tests for cycles