cleanup test

my go at a fix for #26