In progress.
Add test for static method on mixin.
Merge branch 'develop' into feature/CORBA