#1 move unittests into same namespace

[Duco Dokter]

The unittests are now in a separate namespace. This
should be moved into the same namespace to enable
package scope tests.