DRY tests
Added context
Minor fix
Tested context