Master sc

I have tried to add new tests without success, here is the final product.