merge tests to dev