Standardize Conventions

Bring tests up to recommended conventions