More testability changes