Updated test framework and added test vectors