removed timestamp decode, added more tests