Enabled unit testing parameters in Makefile.

These were earlier disabled since the unit testing scaffolding had as
yet not been set up.
Merge branch 'topic-testing' into develop