Minor refactoring of testing suite