Finally got all the pivotal-related tests working.