re-add tests accidentally removed in rebase for e4cc0b4