More tests

why pass in the context here?