Fixed remaining conflicts in test files
Ipageobserver was not found in model. Remove import.
Fixed two test class related errors which happened due to rebase