Add some convenience functions and additional specs

TODO: Rearrange expectations to be inside success blocks