Improve narrative; add BFG test