Adjust fixtures + functional tests