take portrait/landscape into account
improve testing