Improved test design