Minor fixes to unit tests and composer configuration