updating path and typo
update to add test stubs and targets
cleanup conflicts after git pull