Kicker fixes, tests