Merged Front-end with Javascripts tests