Refactor some test