Optimize Routine and Manual Tests