Re: Test suite overhaul