Clean up; Test: add view tests; Promise: untested changes