Updates to tests, not finished but checking in work.