Moving all packages one up
Adding tests for traits
Delete unused imports
Adding new test
Merge branch 'master' into solution