Test updates, also made icon protocol agnostic