further initialize/test refactoring. eliminated several overly long code lines.