Added unit tests and renamed Class file due to typo