Added Tests to last version