Unit Tests

Added some new UnitTests