Fixing pending testing

[WIP]