view code fixes
system.out.print remove + testfixes