Tests rebuild

WIP