refactored tests; removed testdata method object