Acceptence tests fixes