Merged test files in src/test/java/net.sf.sail.webapp/* to src/test/java/org.wise.portal/*.