updated for more testdata