removed all hardwritten timestamps and generated keys from tests
Merge branch 'tests' into develop