add context
clean up tests a little
add context
a little cleanup