Test before doing anything, minor refactoring