Merging evan-ui-test into evan-dev