Fixed Case Sensitivity Issues + Added more unit tests