Fix broken test + add missing enters at end of files.