Merged origin/master
Added test Helpers and divided test modules.