Removed the unnecessary test messaging
Rebased on to master