New tablets and tests added. Fixed minor regex collisions.
Updated the json with tests.