improved test-impl