Reorganise testing

Some more tools for rethinkdb