Increased test coverage and deleted unnecessary items