clean up tests a bit using Test::Lib