Adopt tests from factory project