Simplify tests
merge origin