tests: improved. Yes, again ;)