Updated viewer class
Added viewer tests