Remove the view tests
Tweaks