diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2712acb..ccc840c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,23 +1,14 @@
-# Contributing to Eclipse WTP Java EE Tools
+# Contributing to Eclipse WTP Source Editing
 
 Thank you for your interest in this project.  Don't forget to sign your Eclipse Contributor Agreement before proposing any changes.
 
+In addition to the changes you're proposing, you should be familiar with Git and using SSH keys with Git.
 
-In addition to the changes you're proposing, you should be familiar with Git, using SSH keys with Git, and may wish to read through https://wiki.eclipse.org/Gerrit as we use the Gerrit system for reviewing and merging contributions.
+If you're seeing this repository somewhere other than [this GitHub repository](https://github.com/eclipse-jsf/webtools-jsf), it's not the authoritative version used for our releases every quarter. Opening pull requests or submitting changes there will be of no use.
 
-If you're seeing this repository somewhere other than on git.eclipse.org, it's not the authoritative version used for our releases every quarter. Opening pull requests or submitting changes here will be of no use.
-
-1. Clone the repository using one of the URLs at the bottom of https://git.eclipse.org/c/jeetools/webtools.javaee.git . If you're not sure about your user ID, your actual clone URL can be found at https://git.eclipse.org/r/admin/repos/jeetools/webtools.javaee,general .
-1. Set up your Gerrit access, including a SSH public key, on https://git.eclipse.org/r/ .
-1. Take note of your Username as listed on https://git.eclipse.org/r/settings/ (when logged in).
-1. Add a `git remote` for gerrit using `ssh://{username}@git.eclipse.org:29418/jeetools/webtools.javaee.git` (optional if cloned from the authoritative repository)
-1. Ready your changes
-1. You should run the Maven build locally, supplying using at least Tycho 2.7.5 for the values in `-Dtycho-extras.version=${tychoVersion} -Dtycho.version=${tychoVersion}` and profile `bree-libs` with `-Pbree-libs`.
-1. Create a local "topic" branch and commit your changes.  Please start your commit messages first line with the word "bug" and the bug number, e.g. `Bug 12345` to refer to bug 12345, both to make it more understandable in the eventual git history and to allow Gerrit to automagically link it to the bug report.
-1. Push your changes to the Gerrit remote using refspec `HEAD:refs/for/master`
-1. You'll be given a URL like https://git.eclipse.org/r/c/jeetools/webtools.javaee/+/163278 unique to your changes. Please go there and click on ADD REVIEWER, choosing the [project lead](https://projects.eclipse.org/projects/webtools.jeetools/who) and PMC Lead, Nitin Dahyabhai, so they get notified of your proposal.
-1. If you need to make more changes, find the generated Change-Id on your change's page (e.g. `Change-Id: Ibe9f831a614edfe4e637038c4de0c3a849efb329`), and make sure it is copied as the last line in your updated commit message. Then you can push your commit as before and it will have a history in Gerrit on the same page with the same conversations.
-
+Hints for pull requests:
+- You can run the Maven build with the standard `clean` and `install` goals. Optionally you may specify a Tycho version using `-Dtycho-extras.version=${tychoVersion} -Dtycho.version=${tychoVersion}` (4.0.4 and higher)` and profile `bree-libs` with `-Pbree-libs`.
+- Please refer the GitHub issue in your commit message (e.g #1). If you're fixing an old bug [from Bugzilla](https://bugs.eclipse.org/bugs/), start your commit messages first line with the word "bug" and the bug number, e.g. Bug 12345 to refer to bug 12345 to make it more understandable in the eventual git history.
 
 ## Eclipse Development Process
 
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/.classpath b/tests/org.eclipse.jst.j2ee.core.tests/.classpath
index 8d90055..9fb8bad 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/.classpath
+++ b/tests/org.eclipse.jst.j2ee.core.tests/.classpath
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="commonArchiveTests"/>
-	<classpathentry kind="src" path="mofj2eeTests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="commonArchiveTests">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="mofj2eeTests">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.core.prefs
index ffaa166..9898a42 100644
--- a/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,16 @@
-#Thu Apr 26 13:28:24 EDT 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -55,4 +54,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8