Add some test cases again