#586 Fixed layout service tests