Update testing to current best practices. Addresses #2 properly.