Update to lab 5.0. Test clean up. Closes #10