Dedicated file functions, so expectations are easier to read.
Fixed typo
Added remaining phpUnit tests and improved the others.