Junits for Raj to grade.
Fixing errors during demo.