Fix Jasmine tests, update subview markup