More Print text Fixes and tests