Change code style in test
Remove unused module dependencies
Code cleanup
Upgrade module dependencies