Just moving stuff in acceptance tests