added back paths and modified unit tests