W.I.P
- Added stub tests
- Added notes to beed-up existing tests