Added some tests for composition and some more for andf.