More tests with a hint of refactoring

I meant for SENSORNOTACTIVE like vars