Bugfix of AvA %.

Tests need some love.