Fixed tests per new folder layout