Added comments, test checks