more tests
Fixed up stubs, implemented some
Merge pull request #1 from m13hall/master

Master