GIBS-546 Small fixes to layer configuration tests and to build