ViewerTest updated