Moved strings used in unit tests out of resource into literals
Simplified delegate for tests