Convert to new unittest coding standards