* Increase coverage

* More tests

* Tweak thresholds

* Fix ts errors

* Clean duplicate id issue, moving away from ids in future tests