WIP porting tests from doh to intern