Readded test file
Refractoring
Updated add-on and general information