Add some test cases + editable definition