Cleaned Up

- Removed wrapper Functions
- Added Tests targeting Objects
- Added Attributes 'store'