Fixed some more issues in test classes which happend due to rebase