Some changes.
Added testing file.