Refactor the bleeding edge tests like the normal package tests.