One more part of the test and better comments