Merge map init and layer init tests