Converted to using Test::Base filters and blocks for test data