Console and tests pimped