Uncommented all the tests