Raman - Refactor test