Added some Unit Tests