Tests update

Just few ideas.
It's not. Overlooked.