ticket 1: Test fixed, view fixed