move new extension specs to right context

.. and clean them up