Adds unblockify tests, and small refactor