WIP on mock-tools + mock-apache