Adding initial unit testing

Reorganized existing (integration) testing code