Adding basic test cases and correcting typecasting for tests