base tests
merge conflict