Update tests
Update tests according to friendly module
Add friendly module