Simplified the NIST tests and reduced duplication