moving to complex stuff and RESTful tests