Uncommented the funtional tests