Raman - refactor test