More control flow and simple test files.