Some changes to test files and nag