Test solution notification
Minor cleanup
Protocol tests