Some TODOs and testing
Add some testing to all the operations
Fix all TODOs