Refactoring test organization; specter --test works