Minimizing bytes and adding tests