Increased test coverage and finished to organize test packages