adds testing, updates main