added some basic tests
Showing results only of some important keys
some layout changes