Copy tests from #203