Merge tests from master to dev