Bump junit version, add hamcrest, add todos