Updated spec/acceptance tests