Refactor tests with more utils
Functional XPI tests