test: port a couple more core tests