Code and test clean up, and select all now selects all models under client or infinite mode