Fixing assignment of credit from inconsistently-mapped bases
Wayward base returned home
Adding back all the tests