Added ideas for non-brittle tests post and performance optimization.