Converted to a proper package/test.