Upgrade to 2.0, test code still wip
Upgraded test cases to PHPUnit
More changes, still not working