tests improved
badges are important
added timestamp, improved test