fixed test failures; adjusted to test resources