Add some more tests; including a problem that cycles