Code cleanup
Add Tests\Emphasis