Need to think a bit more as it requires the test library, which isn't immediately available... Likely need to make this a proper package and put the library there..