Increasing code coverage on numeric sensors and cleaning up code