Better solution for testing