Refactored to accept test vectors & auth data