Unit Tests

- Corrected test count, which was artificially low, hiding some failing tests.