Fix/tests

@calvinfo this gets all the tests passing, and added the ability to do

```
$ make test integration=BugHerd
```