Fixed failing test Added tests jslint errors Minor refactoring of layout bundle revert layout/bundle.json