Failling and commented out tests are now pending