Composer + unit tests WIP