Removed old comments
Add mock modules