Started adding testing