Removed Optimization and Added Test file