Merge "Refactor tests to check actual behavior of methods"