added script fixtures and other changes