Fix the TDD task
Minor cleanup.
Use embedded resources if present