moat tests and more coverage