Akshay/Pooja: Refactoring tests
Pooja: fixing curriculum progress view.