Small changes for test