Finish stream key impl and added tests