unit testing continued...
fixme
Merge pull request #22 from ondine/development

Development