Small changes to test