Composer support + tests and fixes.