Fixed TreatmentPlan logic, added ScrollView, and added more Junit tests