Thesis: Many additions and modifications
Testcode reorganizing