New tablets and tests added. Fixed minor regex collisions.
Updated the json with tests.
Merge remote-tracking branch 'remotes/origin/master' into devel