Updating for composer support.
Fixing failing test.