Included $message param reference in comment 
Removed leftovers from developing tests