Testing changes

Updated testing to fit with the new organization. Also updated our readme and makefile to accomodate and be more up to date.