PARTIAL - add some test ideas