refactorings and added test resources
Merge branch 'dev' of https://github.com/metajungle/proteus-common into dev
removed duplicate files