Fixed for inheritence, reserved words and Twig tests