Fixed bug with view methods not being added correctly
- Added some additional tests