Added some more tests, dropped some useless ones

No need to do type checking in tests.  Also fixed a tabbing issue.
Fixed failing tests