default: switch branch coverage improved
default: switch branch, much better

Almost done :) Conditional compilation removed