Adding Value to Physics Laboratories for Pre-service Teachers