Merge pull request #297 from oyvindln/development

Unit test stuff