Merge pull request #394 from dennishendriksen/testing

Fix package declarations