Add handy work and testdata functions