VE-169 Fixing bugs from acceptance tests