All probelme solved! Test code added!