Migrate tests to use new commons testing package