Fix when/when-not-available
Add more possible core-test tests