Fix gnlcomposition tests
make simple pass, fix me up