Added more tests + third party composites