Reduced entity count for test so it is not so system intensive. Fixed br...

...ackets and new naming method errors.