Add generic test
Let the battle begin
Fix bootstrap