Testing and Refactoring

Updated the test suite to use the latest and greatest version of PHPUnit and to handle code styling tests. Also ran through some format updates.