Tests update

Just few ideas.