Merge "Tests: Fix case of some methods"