Raman - Fixed failing tests