Added test-machine just passed to Tim (formerly Niendorf-47)