Cleaned and commented Tests