Added more test cases and fixed bug

Had to replace x with self.args[0]