MTP-2 Fixing tests and making sure that it runs on unix machines.