Some changes from master for tests