gaufrette orphanage fixes and tests