Add question as a FIXME comment
Add some tests for the waiting actions

I wrote these previously, but forgot to add them to git