Simplified the NIST tests and reduced duplication
Merge pull request #50 from alex/simplify-nist-tests

Simplified the NIST tests and reduced duplication