More unit tests and a directive for reading files.