Get rid of some done TODOs.
Add some following tests.
Create some stuser tests.