chore(v2): Code cleanup, edited tests, and updated benchmarks

Closes #121