Deleting unneeded test class
minor test class update
Added some some memory params to the main build launch configuration for eclipse
"merging local changes with origin/master"