Raman - Refactor test code