Added some more to the testing, evaluations complete just need to compare now.