add context
clean up tests a little