Finishing up the needed changes

Also executed the acceptance tests successfully now.