Remove unneeded include
Updated acceptence tests to work with changes