Reduced entity count for test so it is not so system intensive. Fixed brackets and new naming method errors.