Fixed tests falingi due to the new folders and resources in different folder than classes.
Updated references