Improved test controller