tests: improved tests