Added more tests
Changed some more tests
More testing
remove data tests