Resolving some test failures

- still need to find out how to add local file/archive