Fix tests, move attribution to head