Quarantined test view code

Major refactor ahead, so decided to keep the test stuff to itself