Added better testdata code