Merge "Add tests"