Test bug fix (types replaced by trait), tutorial improvements.