enhaced user unit & acceptance tests