Refactored tests
Merge branch 'master' of github.com:culturecommunication/ginco