Merge "Improve tests"