Fixed print outs, increased range of tests