Improved test spec