Added failing tests to cover newly found bugs