Add test, and fixup to make it work