Some tests polishing