New commit, questions answered and test-file removed.