Started adding some automated tests