Removed dependency to log4j, update junit to 4.11