Unit/Acceptance Tests

aaron borik and aftab zindani
update tests

inb4 this deletes the repo