Yes, that would probably be the easiest solution. The test function looks good. Unfortunately it may not work right now due to #897, but that's not your fault!