re-structure and add test
Merge branch 'restructure_testing' into fix_bower_undefined_package_name