WIP switch category. Seems good but need to update tempo in wrapper.
Remove JUnit servlet