Merge "Add missing tests"