Started adding tests