Merging fixed project into evan-test