A few unit test adjustments to get rid of legacy tests