Re-configured lucene components and tweaked tests