Remove unused stuff in test package