Added better test view.