Removed empty test file from merge