I am going to continue to work on the tests today and add them to this PR.