Cosmetic changes
Use tinytest
Add all location attributes