more unit tests and removed unnecessary class