Completing tests, code review comments.