more specs fix; context issue with handlers