Test without hack with layouts