Fix collect + add some test coverage + modify demo_seed