Add Troll, battling and some tests