View tweaks
Test refactor