Updated Unit Tests

Added a few more tests