Minor fixes, fix request issue in acceptance tests