More Unit Tests

These all pass.