Composer cleanup, additional tests