Tweak PHPUnit file
Code tweaks
Organize ignore file