maybe a bad idea
resolved conflicts
new method of computing information added
also keep track of testhistory IDs
also keep track of testhistory IDs
merged subject.py