Basic tests, some changes to locales
Shortened variable names
Added package files