Fixed tests, css, js and display_macros view