Simple aesthetic change.
Some test infrastructure.
Let's parse
Merge branch 'master' into basic_functionality
first steps for #4