Tests update

Just few ideas.
Thanks!