Updated JUnitTests

To be continued...
Can edit relationship details
Started printing of relationship details and other fixes
Added todo warning to drawing relationship details
Merged with master