Tests added and bug fixed
Badges fixed
Bug fixed