Most all test code written

more commenents