WakeUp checker tests (and other fixes)