Tests: Fixed tests after grunticon merge and theme tweaks.