Merge "Move out test utilities to a Testables library"