Cleaning up tests, consolidating bower.json files