Fix acceptance tests

LMS-1127