Version 2 (comment out tests)