Convert all Suppliers to the new tests
Remove obsolete test file