added rebaseline script; improve acceptance tests