Added junit dependency, removed some tests