Fixed test, and full custom set editor