Additional tests and fixes for cases.