Updated test files to reflect changes