Hopefully fixed everything so that using a raw mouse now works
Added an extra test for closure