added test method which NSLogs a message
Removed test method which was merged in from dev branch
Merge remote-tracking branch 'origin/master'