LUN-368-tests - small changes