Final fixes to get the sample test compiling