fix #44 and enhance composite support tests