Some changes to get tests going