improved test classes