Uncommented out tests