Move testability to the bottom