Fixed Merge errors and broken test cases due to Character Refactor