Convert to barebones test suite