Added more logic tests