Fix the review comments, also now using derby in memory DB inplace of
embedded.