Unit Testing + Projects Bug Fix