Improved tests a bit (made more rigorous)

When there be more tests then it should go to separate class, additionally i was considering to start using assetj to have more fluent api (at least as experiment:) )