Revert test 007 back to working order