Changes to keep tests functional