Updated acceptence tests to work with changes