improved test skeletons