improved testing mechanics and added divisions