Properly scope test methods. Fix 'default' alignment / type.