added tests up to context-still have fails from rollback tests