Minor refactoring in test branch, removing extra stuff