Merge pull request #4 from HackforSC/sh-fixtests

update to junit4 and jdk7, fix eclipse facet anger