Added a few things to fix tests
Fixed some expectations and a missing method