OOps get rid of NotNull annotations. Not cool
Fix imports for tests as well, to use FileUtil properly