New tests, fixes for enlil