Tests: Style
Remove Style Singlton (late night refactor.. double check)
Highlight missing tests