View fixes + pre-tests