Some tests have been added
conflicts removed in .classpath file