improved test skeletons
improved test skeletons