Fix booksamples

Fix two of the three failing test of samples book.