Corrections and added test examples
Test done