Bugfix and Clean up - renamged printf and added test16 to main call