Updated composer
Added unit tests