Including --flag tests.
Better whitespaces.
Adding a TODO.
Renaming tests file.