INTEGRATING EXPERIMENTATION AND INSTRUMENTATION IN UPPER-DIVISION PHYSICS