Refactoring of test code. Now we can add test vectors.