Uncomment stuff I commented for earlier tests