Change context & it & expect interface, removing thread-safety