Cleaning and commenting
Database test buttons methods added