Removed obsolete stuff
Use plain old files instead of embedded resources for tests