More robust testing && comments