Fixed tests requiring further investigation based on TODOs and CHECKs from the text