Fix for the failing acceptance tests

@JonahStanley @wedaly