WIP Fixing test process