tests passing with nested rules and conditionals, updated sub parsers, removed uid injection