At this point, I am not sure how to do unit tests with parse, but I think we should merge the changes so that others can have the current, working version of the project. I will look into testing in the next few days.