Moving these from the test folder where they don't belong to the
tools folder - for testing :)