Module 06 and fix tests