adda couple of composition tests and kick old one