Unit Tests

Wrote more unit tests