Fix the tests...
Update apiary docs