Fixing bugs
Fixing test