Life is easier if we just keep test code in the same directory as the stuff it's testing... Test: tests still build and pass Change-Id: I9b35d689098bdc28a71d69645b0ca9fdd6ea0108