Reorganized tests. Closes #129. Better PHPUnit command line.