fixed embedded resource locator + tests