Fixed the failing test issues