Add some test cases to demonstrate further bugs to fix, also some that covers some earlier fixes more.