more tests
merging conflict in tests