better type resolution
better screen tests