remove old function
fix test setup