Changed a few implementations
Modified Structure of Unit Tests