Make use of salt-testing

Several test cases fixes including the required code to run the test case from `__main__`