Fix bg layer and map tests