Rebrand, fix unit tests