Error handling improved. Test parameters improved