AddBook test close to fix it

Still failing AddBook test but very close to fix it, only call to the
control left