Further refactoring the rwc tests